ffix build on nightly rust

diff --git a/src/cargo/core/source.rs b/src/cargo/core/source.rs
index 1a92b6052d01ba8f096411eea71f671e410b710c..1335293c3ab796f9cc51eb0d7aed380c09d66415 100644 (file)
--- a/src/cargo/core/source.rs
+++ b/src/cargo/core/source.rs
@@ -291,14 +291,14 @@ impl<'a> SourceMap<'a> {
         let source = self.map.find(id);
 
         source.map(|s| {
-            let s: &Source+'a = *s;
+            let s: &Source+'a = &**s;
             s
         })
     }
 
     pub fn get_mut(&mut self, id: &SourceId) -> Option<&mut Source+'a> {
         self.map.find_mut(id).map(|s| {
-            let s: &mut Source+'a = *s;
+            let s: &mut Source+'a = &mut **s;
             s
         })
     }
@@ -320,7 +320,7 @@ impl<'a> SourceMap<'a> {
     }
 
     pub fn sources_mut(&'a mut self) -> SourcesMut<'a> {
-        self.map.mut_iter().map(|(_, v)| { let s: &mut Source+'a = *v; s })
+        self.map.mut_iter().map(|(_, v)| { let s: &mut Source+'a = &mut **v; s })
     }
 }
 

diff --git a/src/cargo/util/errors.rs b/src/cargo/util/errors.rs
index a33ca305c470fa63afc057f922199d326df1062e..e4f7c92877fe36d4b3a4285460b25afdd7c3c325 100644 (file)
--- a/src/cargo/util/errors.rs
+++ b/src/cargo/util/errors.rs
@@ -197,7 +197,7 @@ impl CargoError for ProcessError {
     }
 
     fn cause(&self) -> Option<&CargoError> {
-        self.cause.as_ref().map(|c| { let err: &CargoError = *c; err })
+        self.cause.as_ref().map(|c| { let err: &CargoError = &**c; err })
     }
 
     fn with_cause<E: CargoError + Send>(mut self,
@@ -230,7 +230,7 @@ impl CargoError for ConcreteCargoError {
     }
 
     fn cause(&self) -> Option<&CargoError> {
-        self.cause.as_ref().map(|c| { let err: &CargoError = *c; err })
+        self.cause.as_ref().map(|c| { let err: &CargoError = &**c; err })
     }
 
     fn with_cause<E: CargoError + Send>(mut self,